From a1903458ad5f4ab4da58abe5bfeb487c4795fe88 Mon Sep 17 00:00:00 2001 From: "harry@dory.(none)" Date: Wed, 26 Jan 2005 13:09:50 +0000 Subject: [PATCH] bitkeeper revision 1.1159.212.45 (41f7969elyNTzsGsx57vqxgKK9SrRQ) This change set moves the USB back and front end driver source code from the 2.4 sparse tree to the 2.6 sparse tree in preparation for porting the usb virtualization to 2.6. This change set makes changes to the 2.4 mkbuildtree necessary to link the files back into the 2.4 tree to preserve the previous usb functionality for the 2.4 kernel. The usbif.h file is also moved to be consistent with the location of the netif.h file and necessary changes made to #include directives. The usb code in the 2.6 tree is not yet integrated with the 2.6 build process so the 2.6 build does not attempt to build it. Tested with make world for both *2.4* and *2.6*. Signed-off-by: butterwo@uk.ibm.com --- .rootkeys | 14 +++++++------- BitKeeper/etc/logging_ok | 1 + linux-2.4.29-xen-sparse/mkbuildtree | 10 +++++++++- .../drivers/xen/usbback}/common.h | 2 +- .../drivers/xen/usbback}/control.c | 0 .../drivers/xen/usbback}/interface.c | 0 .../drivers/xen/usbback/usbback.c | 0 .../drivers/xen/usbfront/usbfront.c | 2 +- .../drivers/xen/usbfront}/xhci.h | 2 +- .../usbif => xen/include/public/io}/usbif.h | 0 10 files changed, 20 insertions(+), 11 deletions(-) rename {linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend => linux-2.6.10-xen-sparse/drivers/xen/usbback}/common.h (98%) rename {linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend => linux-2.6.10-xen-sparse/drivers/xen/usbback}/control.c (100%) rename {linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend => linux-2.6.10-xen-sparse/drivers/xen/usbback}/interface.c (100%) rename linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/main.c => linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c (100%) rename linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/main.c => linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c (99%) rename {linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend => linux-2.6.10-xen-sparse/drivers/xen/usbfront}/xhci.h (99%) rename {linux-2.4.29-xen-sparse/arch/xen/drivers/usbif => xen/include/public/io}/usbif.h (100%) diff --git a/.rootkeys b/.rootkeys index 7fd3ddd868..c88b92b985 100644 --- a/.rootkeys +++ b/.rootkeys @@ -65,14 +65,7 @@ 405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.29-xen-sparse/arch/xen/drivers/netif/frontend/Makefile 41ee5e8b_2rt-qHzbDXtIoBzOli0EA linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/Makefile 41ee5e8bUhF4tH7OoJaVbUxdXqneVw linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/Makefile -41ee5e8bYDQkjRVKnFn5uFyy0KreCw linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/common.h -41ee5e8bt7xeBUJqG5XJS-ofukdsgA linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/control.c -41ee5e8bSs3BGC7yegM_ek2Tn0Ahvw linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/interface.c -41ee5e8bglvqKvZSY5uJ5JGQejEwyQ linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/main.c 41ee5e8bSPpxzhGO6TrY20TegW3cZg linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/Makefile -41ee5e8ckZ9xVNvu9NHIZDK7JqApmQ linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/main.c -41ee5e8ck9scpGirfqEZRARbGDyTXA linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/xhci.h -41ee5e8c6mLxIx82KPsbpt_uts_vSA linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/usbif.h 3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile 3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.29-xen-sparse/arch/xen/kernel/entry.S 3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg linux-2.4.29-xen-sparse/arch/xen/kernel/head.S @@ -228,6 +221,12 @@ 405853f6nbeazrNyEWNHBuoSg2PiPA linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c 4108f5c1ppFXVpQzCOAZ6xXYubsjKA linux-2.6.10-xen-sparse/drivers/xen/privcmd/Makefile 3e5a4e65IUfzzMu2kZFlGEB8-rpTaA linux-2.6.10-xen-sparse/drivers/xen/privcmd/privcmd.c +41ee5e8bYDQkjRVKnFn5uFyy0KreCw linux-2.6.10-xen-sparse/drivers/xen/usbback/common.h +41ee5e8bt7xeBUJqG5XJS-ofukdsgA linux-2.6.10-xen-sparse/drivers/xen/usbback/control.c +41ee5e8bSs3BGC7yegM_ek2Tn0Ahvw linux-2.6.10-xen-sparse/drivers/xen/usbback/interface.c +41ee5e8bglvqKvZSY5uJ5JGQejEwyQ linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c +41ee5e8ckZ9xVNvu9NHIZDK7JqApmQ linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c +41ee5e8ck9scpGirfqEZRARbGDyTXA linux-2.6.10-xen-sparse/drivers/xen/usbfront/xhci.h 412f47e4RKD-R5IS5gEXvcT8L4v8gA linux-2.6.10-xen-sparse/include/asm-generic/pgtable.h 40f56239YAjS52QG2FIAQpHDZAdGHg linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/desc.h 4107adf1E5O4ztGHNGMzCCNhcvqNow linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h @@ -1053,6 +1052,7 @@ 41c0c412FLc0gunlJl91qMYscFtXVA xen/include/public/io/ioreq.h 40f5623cTZ80EwjWUBlh44A9F9i_Lg xen/include/public/io/netif.h 41d40e9b8zCk5VDqhVbuQyhc7G3lqA xen/include/public/io/ring.h +41ee5e8c6mLxIx82KPsbpt_uts_vSA xen/include/public/io/usbif.h 4051db79512nOCGweabrFWO2M2h5ng xen/include/public/physdev.h 40589968wmhPmV5-ENbBYmMjnedgKw xen/include/public/sched_ctl.h 404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/public/trace.h diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d14c442f66..1dea475da8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -17,6 +17,7 @@ cwc22@centipede.cl.cam.ac.uk djm@kirby.fc.hp.com gm281@boulderdash.cl.cam.ac.uk gm281@tetrapod.cl.cam.ac.uk +harry@dory.(none) iap10@freefall.cl.cam.ac.uk iap10@labyrinth.cl.cam.ac.uk iap10@nidd.cl.cam.ac.uk diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree index cabf622133..d22c951359 100755 --- a/linux-2.4.29-xen-sparse/mkbuildtree +++ b/linux-2.4.29-xen-sparse/mkbuildtree @@ -282,4 +282,12 @@ ln -sf ../../../../../${LINUX_26}/drivers/xen/blkback/vbd.c cd ${AD}/arch/xen/drivers/blkif/frontend ln -sf ../../../../../${LINUX_26}/drivers/xen/blkfront/blkfront.c - +cd ${AD}/arch/xen/drivers/usbif/frontend +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbfront/usbfront.c main.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbfront/xhci.h + +cd ${AD}/arch/xen/drivers/usbif/backend +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/common.h +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/control.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/interface.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/usbback.c main.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/common.h b/linux-2.6.10-xen-sparse/drivers/xen/usbback/common.h similarity index 98% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/common.h rename to linux-2.6.10-xen-sparse/drivers/xen/usbback/common.h index 550599ad91..caa2df673b 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/common.h +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbback/common.h @@ -15,7 +15,7 @@ #include #include -#include "../usbif.h" +#include #if 0 #define ASSERT(_p) \ diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/control.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/control.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/control.c rename to linux-2.6.10-xen-sparse/drivers/xen/usbback/control.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/interface.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/interface.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/interface.c rename to linux-2.6.10-xen-sparse/drivers/xen/usbback/interface.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/main.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/main.c rename to linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/main.c b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c similarity index 99% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/main.c rename to linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c index 8cf879c232..5cb7269a6b 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/main.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c @@ -81,7 +81,7 @@ #include "../../../../../drivers/usb/hcd.h" -#include "../usbif.h" +#include #include #include diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/xhci.h b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/xhci.h similarity index 99% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/xhci.h rename to linux-2.6.10-xen-sparse/drivers/xen/usbfront/xhci.h index 4be67b9f87..2bb07cf788 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/xhci.h +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/xhci.h @@ -3,7 +3,7 @@ #include #include -#include "../usbif.h" +#include #include #define XHCI_NUMFRAMES 1024 /* in the frame list [array] */ diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/usbif.h b/xen/include/public/io/usbif.h similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/usbif.h rename to xen/include/public/io/usbif.h -- 2.30.2